]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
network: don't return null from NMConnectionDevice._getStatus()
authorGiovanni Campagna <gcampagna@src.gnome.org>
Mon, 19 Aug 2013 21:14:15 +0000 (23:14 +0200)
committerGiovanni Campagna <gcampagna@src.gnome.org>
Sat, 31 Aug 2013 16:52:01 +0000 (18:52 +0200)
StLabel complains set you set the text to NULL

https://bugzilla.gnome.org/show_bug.cgi?id=706262

js/ui/status/network.js

index 376cb2c912611e80284e524df4a6555250f1f384..20157f4fa486db5a3dc977b2ae414c2890fc0ed6 100644 (file)
@@ -352,12 +352,12 @@ const NMConnectionDevice = new Lang.Class({
 
     _getStatus: function() {
         if (!this._device)
-            return null;
+            return '';
 
         switch(this._device.state) {
         case NetworkManager.DeviceState.DISCONNECTED:
         case NetworkManager.DeviceState.ACTIVATED:
-            return null;
+            return '';
         case NetworkManager.DeviceState.UNMANAGED:
             /* Translators: this is for network devices that are physically present but are not
                under NetworkManager's control (and thus cannot be used in the menu) */